From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 15 Apr 2013 13:42:29 +0000 (+0200)
Subject: net/tramp.texi: Improve last change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~462
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=dbde58a60313a2bccb24f6b928a7ef2950086f25;p=emacs.git

net/tramp.texi: Improve last change.
---

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 42a3156c1e9..94f194ed959 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3139,6 +3139,20 @@ already an @command{ssh} connection to that host.  Further
 process on that host, will reuse that initial @command{ssh}
 connection.
 
+If you know that your @code{ControlPath} settings won't disturb
+@value{tramp}, you could customize the variable
+@code{tramp-ssh-controlmaster-options} like this:
+
+@lisp
+(setq tramp-ssh-controlmaster-options
+      (concat
+        "-o ControlPath=/tmp/ssh-ControlPath-%%r@@%%h:%%p "
+        "-o ControlMaster=auto -o ControlPersist=no"))
+@end lisp
+
+Note, that "%r", "%h" and "%p" must be encoded as "%%r", "%%h" and
+"%%p", respectively.
+
 
 @item
 File name completion does not work with @value{tramp}